mysqlcppconn-libmysqlclient-SONAME

Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.diff

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
index eccc52173d8e9380ccc7891a1f3fa546f8009858..9c881c2891e81e6623aa8d2113a268b8577bec64 100644 (file)
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -73,4 +73,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
        UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \
 ))
 
+$(eval $(call gb_Library_add_cflags,mysqlcppconn,\
+       -DLIBMYSQLCLIENT_SONAME=\"$(shell readlink -f `mysql_config --variable=pkglibdir`/libmysqlclient_r.so | sed -e s/mysqlclient/mysqlclient_r/ | sed -e "s,`mysql_config --variable=pkglibdir`/\(libmysqlclient_r.so.[0-9][0-9]\).*,\\1,")\" \
+))
+
 # vim: set noet sw=4 ts=4:

diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 9c2282e52117dce91ce3f93913272a44f09202de..9c3448ad2ab7a1f4c088a34794917cf62a724227 100644 (file)
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
 
 $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
        external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
+       external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch \
        external/mysqlcppconn/patches/default_to_protocol_tcp.patch \
        external/mysqlcppconn/patches/warnings.patch.0 \
 ))

diff --git a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch
new file mode 100644 (file)
index 0000000..01922c9
--- /dev/null
+++ b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch
@@ -0,0 +1,12 @@
+diff -urNad mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp
+--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200
++++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp   2009-08-20 20:25:31.000000000 +0200
+@@ -26,7 +26,7 @@
+ #elif defined(__APPLE__)
+ static const char * const baseName = "libmysqlclient_r.dylib";
+ #else
+-static const char * const baseName = "libmysqlclient_r.so";
++static const char * const baseName = LIBMYSQLCLIENT_SONAME;
+ #endif
+ 
+ template<typename FunctionType>